Get gem back to compliance with 1.8.7