Revert "JC-659"

reverts commit 3e693ffd08f60204848aeadee7d602d65d2cd0b6.
Merge remote-tracking branch 'origin/master'