SAK-23435 revere merge r123008:123007

git-svn-id: https://source.sakaiproject.org/svn/user/branches/sakai-2.9.x@123052 66ffb92e-73f9-0310-93c1-f5514f145a0a