Revert more changes
Bugfix