it saddens me that that there is not real fix available yet

If you're sad, a great way to help would be to contribute a test case that shows this happening on ORM 5.0.x...