Revert "Updated for OpenVPN build"

This reverts commit 08104ef0e1c366550a55928fb6c37569472ba71a.