So much for atomic commits.... :)