block-extroot: r20784 reverted r20735, add it back (#7104)