Revert "Merge pull request #1607 from christianv/CLC-2583"

This reverts commit 7e5da2623ef50e0cc8736a40226b1e3629e568b3, reversing
changes made to a6213cf7e6c8b5c1680f7ef7be6b3ea4707ef2f1.