Preliminary fix checked-in on trunk [dcc277f29a].

Is it possible for you to verify that this fixes the issue seen in your
environment?

Closing this ticket as 'duplicate'.  Further comments on this issue should be
added to ticket [48a6b8e4ca] instead of this one.