Revert "Merge branch 'pr/1'"

This reverts commit ec93d609b6ff7f298e7e9da1bda9a59a9cbe48c4, reversing
changes made to 4f5343c8e3b39b416e5f11302da7386937250318.
Revert b032e17..fa825dd

This rolls back to commit b032e179e426f5a4dd656872db59896bd4c6907a.