Revert to c47f01c1f20ee8461a042d8e1bc0e76be8e2e052