I was hoping that the test case would tell that. I only removed my patched approach when I upgraded to 5.1.x and saw the changes made for HHH-10267. All I can say is so-far-so-good at least for me personally.