Revert and improve.