Revert some custom changes

Fixes some late conflicts with latest core that caused bugs