Somehow, I don't see this happening :)
Not going to bother unless we get bug reports about current hack.