Cherry-pick old working OMX patch