Roll back r31519 and r31521: George convinced us that these approaches
weren't right.