Reapply clobbered commit