This reverts commit 9200fa6d.  It was
wrong because it works only if the target song has already been
scanned.