The last merge dropped quite a few files. With no other obvious way to fix it, I just replaced the entire content with that of the last fully working changeset.