Revert "Made main_rethinkdb_porcelain be refactored a bit for some reason."

This reverts commit 3f0118bc0807e7a0e124c3d2703f776b90f93199.