Revert "TRUNK-3915 Corrected back port"

This reverts commit 4764752200209a0329e77b20aa1ca372c5518ccc.
 Revert "TRUNK-3915 Resolved and successfully tested."

This reverts commit e0a7c2b8b950fe4687b666459232b00f2a486662.