We would need to get rid of this also. Same problem in unit tests, I assume.