Revert some stupid changes