Make the code more resemble origin/master.