Reapply Ryan's commit without tabs and without a merge