GoogleCloudPlatform/kubernetes — pull request #1263 by jbeda (2014-09-10 20:43:53+00:00)
Title: Revert stuff Max pushed directly by accident.

This reverts commit 42baed492b92769b469e1b3c470183990fe78b16.