Follow up to r105983;