Revert "fix derp"

This reverts commit 84a6cbc8edffe2357b2467197befb28c0c5bd3e5.
Revert "encapsulate legacy omx stuff"

This reverts commit c61f1a85daf551d5569d85f27953beeed9cf953c.