PR and appears to more closely fit the original authors intentions. PR: 58533
PR: 25221 Submitted by: bdluevel@heitec.net