[OE-5173] reverted previous commit (not for g2.1 branch)