Revert "OE-2727"

This reverts commit 837bcf1aa22dba45a622e89eab243b943ebc7f52.
 OE-2727