Revert "Merge remote-tracking branch 'origin/pr/263'"

This reverts commit 16ddf74a47bb56faa6c8ddf1e9c9d51d1c4c4d95, reversing
changes made to 6a19ec3c287e5b2a0f7f1e42a5d43a1ddc2a2b87.