Revert to 1b455977f9532baff55176749aefa81dee5122c9.