Related to http://tickets.musicbrainz.org/browse/PICARD-234