r10124: revert change for openmcl that broke clsql