Revert "VMWC: Testing removal of survey logic"

This reverts commit a18f28aa79250a4e0a85f92b29dfac98dc260c2f.