Mass revert. Please don't refactor things again, gud wizard.