partialy revert changeset 77d1a4fb. fixed one case (that -reindex would fix anyway) but broke another one.