This change matches the corresponding changes in mockup introduced today by davisagli.