Revert legacy egl hacks