Fixing up some weirdness we were seeing around language selection

Change-Id: I242aae9992a0409adbe839b0cae8af53be5399a5