These changes were probably pulled in from #378. Can you rebase to remove them?