Deferred to #5891.