Revert some custom changes

Fixes some late conflicts with latest core that caused bugs
Merge pull request #37 from Nyeriah/revert

Revert some custom changes