I'm not too sure what the above change is intended to do. I think we may want to revert this part.

--Rob