Revert "Merge branch 'iss001'"

This reverts commit aba0751876059939fbf3e9645d74e40cbabd7233, reversing
changes made to 718968a27d46b4b4c0da43643c84bff71a413ac0.