Countermerge

(Hopefully this doesn't break the dev XML. ._. )