Revert to 2412b1a7b97e