CLC-2218 - Gon gem - revert changes