Revert "Merge branch 'acunskis-stub-env-tests' into 'master'"

This reverts merge request !854 (merged)

Master is currently blocked #665 (closed)

cc @andrejs