Revert "Merge branch 'next' of https://github.com/rethinkdb/rethinkdb into next"

Something bad happened before.

This reverts commit 0d74e1752242ea8cce4ab125d436e6ad06a818f7, reversing
changes made to cfa1ee1883c4fbede7f6e8dfa46e13210c1be3fd.