Revert "Merge pull request #28 from openmrs/AC-24_25"

This reverts commit 3a3b893b4cdf8edbf98a8e134ca400481b9a5aed, reversing
changes made to c1d9889fb8fed0d3a2bb131ff595ea06efa04ace.