err.. this breaks the unit tests anyway. I reverted it.