Revert "Merge pull request #342 from smarthealth/hotfix-erxec"

This reverts commit 1ae0143c63bb6d53516a5db27d5e2a94bcbab0af, reversing
changes made to 0f9d473115fc35f0b0a1911725a9a84f434913f6.