PMO-2247: revert change