Merge "Follow-up I3e114219: Don't tell people to use the deprecated replacement of...