Revert "STE OMX Fix"

This reverts commit 0cd037312425a25d22366958e0fc0d4dee28da8f.