Revision 17939 includes part of this fix.