Fixes #6348

At a brief glance it looks good. Temperature still rises, but it seems pretty reasonable now.