diff --git a/roles/openvpn/client/tasks/main.yml b/roles/openvpn/client/tasks/main.yml
index bf273b3a9e..320d3a7ff4 100644
--- a/roles/openvpn/client/tasks/main.yml
+++ b/roles/openvpn/client/tasks/main.yml
@@ -38,23 +38,8 @@
   - service
   - openvpn
 
-#
-# this is a workaround for a rhel7.1 bug: 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1206007
-# Go back to using the service module when thats fixed. 
-#
-
-- name: enable openvpn service for rhel 7.1
-  file: state=link src=/usr/lib/systemd/system/openvpn@.service dest=/etc/systemd/system/multi-user.target.wants/openvpn@.service owner=root group=root
-  when: ansible_distribution_major_version == '7'
-  notify:
-  - reload systemd
-  tags:
-  - service
-  - openvpn
-
 - name: Make sure openvpn is running in rhel 7.1
-  service: name=openvpn@openvpn state=running
+  service: name=openvpn@openvpn state=running enabled=true
   when: ansible_distribution_major_version == '7'
   tags:
   - service