Revert "Merge branch 'issue1'"

This reverts commit 545df515e0f3a94a41032a2d3c2608538663562b, reversing
changes made to 13dc7f4100eadf9b7bcc5c05859d3ff80ed0bfe3.