Backout c19d5e9c60c3 and 8576242fabe4.