This reverts commit 9397bdc6. This optimization is likely to surprise programmers as seen in post-commit comments, so we should add a clang warning first (that is proposed in D121306).
