Arg, looks like this pulls in 79d4e16 because of what this branch is based on.