Argh, partial commits are evil…