Revert "Merge branch 'vip-feedback-changes'"

This reverts commit 05343b1d24e2d277a12f8f81818a01acc739e5ba, reversing
changes made to aaab60aebb1b85ab6e75460dd6912234bdd42770.