Revert "Merge branch 'VE-391' into ve-sprint-4"

This reverts commit 369447a97479f8af826211cfbe5b40ffa021beca, reversing
changes made to 5f559a1ccd352c97c9ab189be0d62b08289782f8.