Workaround activated on trunk via check-in [bb7d27069fb38310].  This issue is
now closed.