Windows and some other boxes.  If this is successful, this rev should
be backported.  I'm not sure how close to the limit we should push this.