Cleaning up a bad merge arifact

Signed-off-by: Johannes Tuchscherer <jtuchscherer@pivotallabs.com>