Code review comment for lp://staging/~phablet-team/network-manager/lp1418077

I'd much rather we semantically split any cleanup from actual bugfix, both in the interest of readability of the diff as well as to reduce the scope of changes and risk of regression.