Added a TODO statement here for deleting this when https://github.com/sakaiproject/Hilary/issues/519 is resolved.