Undoing changes made in cpinter/master before having the PatientHierarchy branch