so yeah, as per above, should undo both of these submodule changes (can either revert or rebase -i them)