Revert all changes in fix attempts