Reverted all the changes so that I could paste them back in steps.