BRANCH 4.2: last check-in didn't work too well.  Reverting