Go back to CM's celox-common

This reverts commit b595323b0189d9f0f740b764806ff9c6633695fc.