Revert "Merge branch 'pr/686'"

This reverts commit e4fd87fc24a6bc10598afb83d5f572db96c241c2, reversing
changes made to d8e34e9dc9b78ca5fdb2271ef65cac8fd1c4496d.