Revert "Merge in changes from ve-sprint-19"

This reverts commit 351b469d7523ec7ea7626d5a6038bcdf036e313d.