SAK-25773

Restore code lost in merge of refactor in r316046



git-svn-id: https://source.sakaiproject.org/svn/portal/trunk@316117 66ffb92e-73f9-0310-93c1-f5514f145a0a