Revert bugfix changes