This reverts commit 1ab83238.

Turns out this doesn't allow for the device ids to be overridden
properly, so we need to revert the thing.
Reported-by: NJef Driesen <jefdriesen@telenet.be>
Cc: Robert Lukassen <Robert.Lukassen@tomtom.com>
Cc: stable <stable@kernel.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>