Update to how master does things.
This will cause nastiness during merging, but I'll take care of that later.