Unreviewed follow-up to r215739 and r215740.