Revert "Merge branch 'pr/1'"

This reverts commit 3c51cca6d1fdf908f9bf5340a5a14c722b531940, reversing
changes made to f0d0f02ccda020feb274492a7ec0bd86010bc946.