Revert "Merge branch 'pr/1'"

This reverts commit 775078fbc5223b6b0ad86d74c8396ce834ced00d, reversing
changes made to db8c0f83999282e5f7d973b21a312b81e9435fc9.