Revert the changs with last three commits in 159 - Patientview tests are failing

Revert the changes that be used to aim the issue.