SAK-26283 reverse merge of r310142


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