Revert "Merge branch 'issue3'"

This reverts commit 4f994dbd21f2744458b06db1130a9b600f700f48, reversing
changes made to e5354601369c7b03decf0c55be2b89bac0ec9654.