Revert "Merge branch 'issue5'"

This reverts commit 7c6d989f072eb6b795c15cf513994b5bbf435fe4, reversing
changes made to ec6d379c32fc8b55ad56f5247b9b1d89d070e84c.