From 1ce13002b56055aff57482edc161fb20ed7b706b Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Wed, 6 May 2015 22:44:36 -0700
Subject: [PATCH] More minor cleanup