Revert and refactor slowly.