Revert "#JC-1625  Fixed"

This reverts commit 5074dff5e72a9d9175e6c8ae4765578244ade141.