Fix Gemfiles post-merge (follow-up to 42c6a63)