Move to a separate device pool, fixes upstream #227