GS-11143 revert previous change