Revert "this commit is related to the following BZs: BZ-983444 BZ-999950 BZ-1005997"

This reverts commit c9485c1dc13c1991c2b69c7ac0c468a662c73936.