Revert some custom changes

Fixes some late conflicts with latest core that caused bugs

http://www.gamingconsortium.org/bugs/view.php?id=7207