Revert "Fix block finding when sd is removed"

This reverts commit 5f3c4af9186c949d4bb71ff80b8602432ba137a0.