I still don't think this should be in here.  Leave it for another pull.