Merge "Remove hacks that worked around issues in OMX components several releases back."