Revert "VE-1333 Fixes from CR"

This reverts commit 61382da3c9b0858285fae83b4b341517e5f54554.