#80963 by chx with multiple contributors: remove deletion and database lock based block rehash code, replace it with simpler updates