These weren't supposed to be merged in yet.  Violently and simply undoing a merge (there is probably a better way of doing this).