I'll back this commit out.  I'm not familiar with what you're suggesting though so I'll leave that one to you. :)