removed crazy logic
Merge branch 'v1.12.x' of github.com:rethinkdb/rethinkdb into v1.12.x