SAM-1330 reverse merge of r314867 as Stephen convinced me this was a bad idea


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