SAK-22347 back inadvertant clobber of r122020 from SAK-16600

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