Revert "|#0|   Vinay, Balvinder|Externalizing controller messages"

This reverts commit 34c3d290fd68fd35ccd5983d249e4754d97b8089.