Comment 5 for bug 1812670

Code expanded and transferred to bug #1819179.

John, I appreciate the testing! Given the tested code has changed somewhat since your testing, I have opted not to add your sign-off.