this changeset is one of the reasons this isn't ready to be merged - I will cherry pick it out...