make previous commit actually build (bit rot w.r.t. _pm_device_id, and more)