[JENKINS#20970] Revert modification