And remove something else that accidentally made it into the diff.