Merge "Follow-up to -no-integrated-as change"