Revert bugged changes