Preliminary fix checked-in on trunk [dcc277f29a].

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