This should have been removed. Please rebase against master.