CLC-2218 - Gon gem - revert changes
Merge pull request #1358 from christianv/CLC-2218-revert

CLC-2218 - Gon gem - revert changes