Resubmitting with a minor tweak... nothing really new yet, just cleanup

Issue #1836