We're moving PPTP back, the whole discussion is rather pointless
to be honest.  We'll make it a plugin for 16.7, I think that's
only fair for users who know what they are doing.