This reverts r272296, since there are clang-tidy failures that appear to be caused by this change. llvm-svn: 272310