Simpler, unit tested throttle to close #613