See the comments in Hall Stream. We should fix this nonsense