Problem introduced by check-in [171138122690faaf] (2014-04-25)
which was an attempt
to fix ticket [388d01d4bb8f9a8b].  That fix was incorrect.