fix JCLOUDS-662

Unrelated to this PR, but: remove commented-out code?