Revert "Prevent deadlock when using always-on legacy VPNs"

A different fix will be applied with follow-up changes. This also
doesn't appear to completely fix the problem (REGRESSION-1963).

This reverts commit ac496f4a.

Change-Id: Ie77e2d4c58ce8c6be68f125d3311ecced6e1e7ca