Remove unnecessary cherry pick (already merged)

also some whitespace nits vim pointed out