Revert minor changes to oUF core so it's not 100% from source.

This will help with upstream updates - they should now be a straight copy/paste.