This change is no longer required, is it?  If you revert this part I'll merge this in.

Thanks,