[OEM-255] reverted previous commit