I am working on a test by the way, not a fix. I think its probably easiest to revert this commit and try another fix for HHH-9460 Closed .