What I am going to do is to revert the change made in HHH-11841 Closed in order to restore the original behavior that this issue reports is now broken. I'll follow-up with HHH-12043 Open in order to properly fix what was intended as part of HHH-11841 Closed .