gudev: revert merge from 3.1 to 3.0