Revert "TRUNK-3915 Resolved and successfully tested."

This reverts commit cebb56d9a123a47ff420c0ade74239d2c3d8c426.