Undo more Rubocop changes outside lib