Revert "#JC-1625  Fixed"

This reverts commit 6e99b03e55871045946f885b87bc013efae8efaa.