Partially reverting whitespace changes from 869d1c12237e7ceeab30400a5ffaca45fb57a045