Making git happy so I can continue cherry picking.