Ugh. Once again, unreviewed, roll out unintentional commit in r202790.