Sorry, this got mixed in from another pull request (https://github.com/apache/spark/pull/850).  I'm going to cut it out of this pull request.