VE-739: Revert what should not have been commited