Fix Gems being banned on past gens
Merge remote-tracking branch 'upstream/master'