Revert "Merge."

This reverts commit a91233622cb6ae605403eb100ace33ce374dee81, reversing
changes made to f89c043962c9036f9f9014d4169ccb8d4123fd87.