Undo revision 58533 58534 fixes.  Those were a workaround for
a problem introduced by 58385.
1 file changed