Wip 6040

Seems to relieve the performance/cpu usage issues on dumpling.