Revert "Merge branch 'pr/1'"

This reverts commit 5cf10ce66e78d64b5d3f108bd26ffbbfa41855d4, reversing
changes made to 68f3a65ec562edef77d02a373c659acd63600b12.