Try to not cherrypick any OMX patch