Alternative to #6332

I would like to test these out more thoroughly, but I don't have the time at the moment to run the engine for a couple of hours. I will get to it tomorrow morning.