Revert "Merge branch 'Let's-delete-this-branch'"

This reverts commit b11c7fbac0948e2bd125f19112c6a525a1a44662, reversing
changes made to e9d8a6f2a6796d213227f2d7b19e294a90c1fdd6.