Revert "Merge pull request #12323 from nullaus/891724-supportcontactcustomization" due to test failures

This reverts commit 534c040499614227c50255a346391e836d1d63d7.