Follow on for T215954
The initial fix for this caused the first issue mentioned here.
This might be fixed - I can no longer repro in 6.3
Confirmed it's no longer reproducible.