Revert "Merge branch 'ticket/master/FACT-570-update-gems' into 1.9.3"

This reverts commit e17e8a51ac5eb9de102715be10d4053c880b335d, reversing
changes made to f8a368bef2bdb3956dcdc11157da3ed531c18641.

This changes need to be made to a new 1.9.3 branch so as to not affect
FOSS 3.2.x-3.6.x security releases.