Put the working version into master.