SAK-26187 backed out r309143

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