Rework re #239 to work off post-1.13 codebase. Closes #239