Revert and fix