Fix leaked change from NoDefaultSelector branch