Uncommented unnecessarily-commented-out code.
Merge branch 'v1.13.x' of github.com:rethinkdb/rethinkdb into v1.13.x