Comment on attachment 48593[details]
Patch
Eric tells me that this is a hack on top of a hack on top of commented out code. However he claims that this moves us forward. I'm somewhat skeptical, but ok.