Revert "Merge branch 'issue-351' into issue-348"

This reverts commit aca7517ec070fe2e8bd6d96f902114c812ae050a, reversing
changes made to bf857ff0efb9dfa73cdf3e902a353c592f3d9681.