Revert stuff keep fixes