Revert "Apply CLJ-884 patch"

This reverts commit 1a1eef2e516dc9d29fe836599981293d5fa0344f.