Revert b63acc & "correctly" order langs