To be honest, I can't be bothered to figure out which commits these
changes should be in.