The existing logic only handled removing the last remaining device section option (which results in the deletion of the entire section) but failed to actually unset single options. Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commit b9fad85f2e3fc988528fd326db715719288604ea)