PLT-773 - Revert OpenGammaClock changes