Oh actually, removed altogether... and now I see what you are doing.  I'd rework the comments on this a lot actually... let me gist it for example: https://gist.github.com/EdGruberman/5265726

And hence why minimal diff is important.  I didn't even at first realize how little you were actually doing here with the big diff.