Just to summarise my view on the code in lines 37-39.
It's a hack, but it's a forced one. Let's let it go and fix its roots later.