So this issue will require making some tricky changes and I'm not comfortable about making these changes in a micro. So targeting 6.1 instead.

Note that I'm not even sure we can provide a fix for the issue but if so, let's not do it in a micro.