Use VolatileSources (should fix some of the recent performance problems).