Revert "Fix JC-1706"

This reverts commit 1ae1bda9e049112a131fdae40d33cd13506d3145.