Reapply commit 112699, speculatively reverted by echristo, since