[Awaiting Review] PR for #1073

This simplified solution seems to match all the requirements set forth in the long email discussion thread regarding this feature request.