Revert "Refactor the code in a fairly trivial way."
Revert "Refactor the code in a fairly trivial way."

This reverts commit 8f790e9a10c95dc32415bf84f8b5dffa4791900a.

marshall007/rethinkdb,greyhwndz/rethinkdb,grandquista/rethinkdb,tempbottle/rethinkdb,greyhwndz/rethinkdb,captainpete/rethinkdb,niieani/rethinkdb,urandu/rethinkdb,4talesa/rethinkdb,matthaywardwebdesign/rethinkdb,Qinusty/rethinkdb,grandquista/rethinkdb,rrampage/rethinkdb,mquandalle/rethinkdb,KSanthanam/rethinkdb,jmptrader/rethinkdb,grandquista/rethinkdb,gavioto/rethinkdb,spblightadv/rethinkdb,elkingtonmcb/rethinkdb,pap/rethinkdb,sbusso/rethinkdb,4talesa/rethinkdb,ayumilong/rethinkdb,captainpete/rethinkdb,sbusso/rethinkdb,KSanthanam/rethinkdb,Wilbeibi/rethinkdb,ayumilong/rethinkdb,greyhwndz/rethinkdb,tempbottle/rethinkdb,bchavez/rethinkdb,mbroadst/rethinkdb,bchavez/rethinkdb,wujf/rethinkdb,ayumilong/rethinkdb,eliangidoni/rethinkdb,bpradipt/rethinkdb,wojons/rethinkdb,niieani/rethinkdb,jesseditson/rethinkdb,greyhwndz/rethinkdb,jmptrader/rethinkdb,jesseditson/rethinkdb,RubenKelevra/rethinkdb,matthaywardwebdesign/rethinkdb,robertjpayne/rethinkdb,AntouanK/rethinkdb,victorbriz/rethinkdb,gavioto/rethinkdb,urandu/rethinkdb,sebadiaz/rethinkdb,catroot/rethinkdb,losywee/rethinkdb,victorbriz/rethinkdb,sbusso/rethinkdb,Qinusty/rethinkdb,robertjpayne/rethinkdb,alash3al/rethinkdb,ajose01/rethinkdb,rrampage/rethinkdb,eliangidoni/rethinkdb,grandquista/rethinkdb,sbusso/rethinkdb,spblightadv/rethinkdb,scripni/rethinkdb,gavioto/rethinkdb,4talesa/rethinkdb,lenstr/rethinkdb,grandquista/rethinkdb,victorbriz/rethinkdb,bchavez/rethinkdb,elkingtonmcb/rethinkdb,elkingtonmcb/rethinkdb,jesseditson/rethinkdb,marshall007/rethinkdb,gavioto/rethinkdb,JackieXie168/rethinkdb,losywee/rethinkdb,matthaywardwebdesign/rethinkdb,marshall007/rethinkdb,yakovenkodenis/rethinkdb,mcanthony/rethinkdb,Qinusty/rethinkdb,niieani/rethinkdb,matthaywardwebdesign/rethinkdb,wkennington/rethinkdb,lenstr/rethinkdb,losywee/rethinkdb,gdi2290/rethinkdb,victorbriz/rethinkdb,Qinusty/rethinkdb,robertjpayne/rethinkdb,wkennington/rethinkdb,mcanthony/rethinkdb,rrampage/rethinkdb,sontek/rethinkdb,yakovenkodenis/rethinkdb,JackieXie168/rethinkdb,mbroadst/rethinkdb,AntouanK/rethinkdb,ajose01/rethinkdb,Wilbeibi/rethinkdb,alash3al/rethinkdb,spblightadv/rethinkdb,eliangidoni/rethinkdb,mbroadst/rethinkdb,ajose01/rethinkdb,lenstr/rethinkdb,Wilbeibi/rethinkdb,tempbottle/rethinkdb,mbroadst/rethinkdb,4talesa/rethinkdb,bpradipt/rethinkdb,bchavez/rethinkdb,eliangidoni/rethinkdb,Qinusty/rethinkdb,Qinusty/rethinkdb,wkennington/rethinkdb,gavioto/rethinkdb,jmptrader/rethinkdb,rrampage/rethinkdb,mbroadst/rethinkdb,catroot/rethinkdb,wujf/rethinkdb,rrampage/rethinkdb,victorbriz/rethinkdb,RubenKelevra/rethinkdb,dparnell/rethinkdb,urandu/rethinkdb,victorbriz/rethinkdb,mbroadst/rethinkdb,4talesa/rethinkdb,wojons/rethinkdb,gdi2290/rethinkdb,sebadiaz/rethinkdb,niieani/rethinkdb,RubenKelevra/rethinkdb,scripni/rethinkdb,Qinusty/rethinkdb,jmptrader/rethinkdb,mcanthony/rethinkdb,mcanthony/rethinkdb,greyhwndz/rethinkdb,bchavez/rethinkdb,elkingtonmcb/rethinkdb,alash3al/rethinkdb,grandquista/rethinkdb,jesseditson/rethinkdb,eliangidoni/rethinkdb,dparnell/rethinkdb,JackieXie168/rethinkdb,wojons/rethinkdb,sebadiaz/rethinkdb,jesseditson/rethinkdb,niieani/rethinkdb,ajose01/rethinkdb,victorbriz/rethinkdb,robertjpayne/rethinkdb,dparnell/rethinkdb,mbroadst/rethinkdb,mcanthony/rethinkdb,victorbriz/rethinkdb,captainpete/rethinkdb,niieani/rethinkdb,wkennington/rethinkdb,bpradipt/rethinkdb,catroot/rethinkdb,elkingtonmcb/rethinkdb,AntouanK/rethinkdb,lenstr/rethinkdb,KSanthanam/rethinkdb,bpradipt/rethinkdb,KSanthanam/rethinkdb,catroot/rethinkdb,yakovenkodenis/rethinkdb,niieani/rethinkdb,scripni/rethinkdb,mquandalle/rethinkdb,losywee/rethinkdb,gdi2290/rethinkdb,dparnell/rethinkdb,urandu/rethinkdb,sbusso/rethinkdb,scripni/rethinkdb,rrampage/rethinkdb,sontek/rethinkdb,sontek/rethinkdb,RubenKelevra/rethinkdb,bpradipt/rethinkdb,wkennington/rethinkdb,catroot/rethinkdb,ajose01/rethinkdb,bchavez/rethinkdb,wujf/rethinkdb,wujf/rethinkdb,sontek/rethinkdb,ajose01/rethinkdb,eliangidoni/rethinkdb,marshall007/rethinkdb,bchavez/rethinkdb,bpradipt/rethinkdb,losywee/rethinkdb,RubenKelevra/rethinkdb,wojons/rethinkdb,Qinusty/rethinkdb,marshall007/rethinkdb,4talesa/rethinkdb,grandquista/rethinkdb,mcanthony/rethinkdb,grandquista/rethinkdb,yaolinz/rethinkdb,yaolinz/rethinkdb,urandu/rethinkdb,captainpete/rethinkdb,dparnell/rethinkdb,yakovenkodenis/rethinkdb,JackieXie168/rethinkdb,ayumilong/rethinkdb,dparnell/rethinkdb,grandquista/rethinkdb,Qinusty/rethinkdb,sontek/rethinkdb,KSanthanam/rethinkdb,captainpete/rethinkdb,KSanthanam/rethinkdb,marshall007/rethinkdb,mcanthony/rethinkdb,pap/rethinkdb,lenstr/rethinkdb,Wilbeibi/rethinkdb,gdi2290/rethinkdb,ajose01/rethinkdb,greyhwndz/rethinkdb,urandu/rethinkdb,wojons/rethinkdb,jmptrader/rethinkdb,matthaywardwebdesign/rethinkdb,gdi2290/rethinkdb,JackieXie168/rethinkdb,wojons/rethinkdb,mquandalle/rethinkdb,catroot/rethinkdb,catroot/rethinkdb,captainpete/rethinkdb,AntouanK/rethinkdb,eliangidoni/rethinkdb,losywee/rethinkdb,urandu/rethinkdb,JackieXie168/rethinkdb,scripni/rethinkdb,robertjpayne/rethinkdb,pap/rethinkdb,losywee/rethinkdb,bpradipt/rethinkdb,yaolinz/rethinkdb,Wilbeibi/rethinkdb,ayumilong/rethinkdb,alash3al/rethinkdb,4talesa/rethinkdb,mquandalle/rethinkdb,JackieXie168/rethinkdb,catroot/rethinkdb,wujf/rethinkdb,gavioto/rethinkdb,pap/rethinkdb,ajose01/rethinkdb,tempbottle/rethinkdb,spblightadv/rethinkdb,dparnell/rethinkdb,wkennington/rethinkdb,tempbottle/rethinkdb,jesseditson/rethinkdb,sbusso/rethinkdb,losywee/rethinkdb,mbroadst/rethinkdb,matthaywardwebdesign/rethinkdb,Wilbeibi/rethinkdb,elkingtonmcb/rethinkdb,pap/rethinkdb,eliangidoni/rethinkdb,spblightadv/rethinkdb,mquandalle/rethinkdb,jesseditson/rethinkdb,sontek/rethinkdb,sebadiaz/rethinkdb,sebadiaz/rethinkdb,RubenKelevra/rethinkdb,scripni/rethinkdb,sontek/rethinkdb,jmptrader/rethinkdb,RubenKelevra/rethinkdb,spblightadv/rethinkdb,JackieXie168/rethinkdb,gavioto/rethinkdb,sebadiaz/rethinkdb,Wilbeibi/rethinkdb,bpradipt/rethinkdb,rrampage/rethinkdb,spblightadv/rethinkdb,matthaywardwebdesign/rethinkdb,jmptrader/rethinkdb,ayumilong/rethinkdb,urandu/rethinkdb,sontek/rethinkdb,gdi2290/rethinkdb,mbroadst/rethinkdb,yaolinz/rethinkdb,ayumilong/rethinkdb,alash3al/rethinkdb,mquandalle/rethinkdb,sebadiaz/rethinkdb,Wilbeibi/rethinkdb,yakovenkodenis/rethinkdb,greyhwndz/rethinkdb,AntouanK/rethinkdb,RubenKelevra/rethinkdb,bpradipt/rethinkdb,alash3al/rethinkdb,tempbottle/rethinkdb,spblightadv/rethinkdb,KSanthanam/rethinkdb,scripni/rethinkdb,tempbottle/rethinkdb,robertjpayne/rethinkdb,sebadiaz/rethinkdb,sbusso/rethinkdb,jmptrader/rethinkdb,lenstr/rethinkdb,captainpete/rethinkdb,tempbottle/rethinkdb,bchavez/rethinkdb,gavioto/rethinkdb,robertjpayne/rethinkdb,KSanthanam/rethinkdb,gdi2290/rethinkdb,dparnell/rethinkdb,wkennington/rethinkdb,robertjpayne/rethinkdb,yakovenkodenis/rethinkdb,AntouanK/rethinkdb,pap/rethinkdb,AntouanK/rethinkdb,mcanthony/rethinkdb,yakovenkodenis/rethinkdb,scripni/rethinkdb,lenstr/rethinkdb,yakovenkodenis/rethinkdb,matthaywardwebdesign/rethinkdb,wkennington/rethinkdb,mquandalle/rethinkdb,pap/rethinkdb,robertjpayne/rethinkdb,niieani/rethinkdb,yaolinz/rethinkdb,captainpete/rethinkdb,alash3al/rethinkdb,dparnell/rethinkdb,JackieXie168/rethinkdb,elkingtonmcb/rethinkdb,sbusso/rethinkdb,yaolinz/rethinkdb,jesseditson/rethinkdb,pap/rethinkdb,yaolinz/rethinkdb,elkingtonmcb/rethinkdb,greyhwndz/rethinkdb,AntouanK/rethinkdb,mquandalle/rethinkdb,marshall007/rethinkdb,rrampage/rethinkdb,bchavez/rethinkdb,wujf/rethinkdb,alash3al/rethinkdb,wojons/rethinkdb,wojons/rethinkdb,ayumilong/rethinkdb,eliangidoni/rethinkdb,lenstr/rethinkdb,yaolinz/rethinkdb,marshall007/rethinkdb,wujf/rethinkdb,4talesa/rethinkdb