Revert "Auto hotplug: some fix ups for Linux 3.4 to stop jitter"

This reverts commit 6d8205ab7137e104248334cc81c91988b1d1276d.