I think this has snuck back in, maybe with the rebase?