This is more of a TODO so I don't forget than a real issue.
I feel like it would be useful to revert commit 9066138 and then enhance the proper test until it can find the issue, if it can't do it in a timely fashion.
This could also be done for: f81fd2f