This reverts commit 72f10f7e. This change was causing a miscompile on an internal test and is being reverted at the author's request until it can be fixed.