It should be cheap enough to do it, and it makes tests easier.
Depends on !80 (closed).
Migrated from D2702 (view on Phabricator)
