Revert "Merge branch 'pulls/2'"

This reverts commit 5f67a90c5526947fecfb2403e801e48a9f728104, reversing
changes made to 7e9b535add87e8bdea5f6e2280a5bb13af6122e1.