Another attempt to undo the changes that went to master but had to go to v2. This time in master, and not in some detached state.