Revert "Merge branch 'SurveyViewController' into Development"

This reverts commit a9e5ad1b45aa87dd2eddbc157c30be67aa8231da, reversing
changes made to 177973451354ceeff4c5b931592e62f94193ded4.