Reverting to v121462, as update v122033 is incorrect; Google Links will be added to this cleaned up version.

git-svn-id: https://source.sakaiproject.org/svn/portal/branches/SAK-22912-extended@122051 66ffb92e-73f9-0310-93c1-f5514f145a0a