Unreviewed, rolling in r197722.