Remove git rebasing code that slipped through