[DEV-1152]

^^ We should keep the spacing the same as upstream to keep the diffs cleaner.