Actually fix root hash thrashing.