Revert last change to avoid self-obsoletes.