This reverts commit 818e554e251c1e07f133aeed9fe0473502ebfdae. Causes miscompiles, see comments on D141188.