This fixes bug #90416. Details of the problem and the fix are on the bug and patch #3. This does feel a bit sub-optimal to me, but I couldn't think of a better way to maintain consistency of state. If anyone has better ideas, I'm all ears. Cheers, Arun