Merge "Remove an obsolete compatibility macro."