Revert "backport to 1.9.3"

This reverts commit 09ccd5eca5ab2b3c762a1f56195c2cda9d132ba3.

Conflicts:

	api/src/main/java/org/openmrs/module/patientaccesscontrol/api/impl/PatientAccessControlServiceImpl.java
Updated to 1.9.7