Wip 6059

also includes a patch removing more of the backfill flushes

hasn't gone through the regression suite yet