REVERT Changes introduced to fix publisher naming.

The underlying bugfix was not introduced until after the 2.2.1 release, so we
need this to stay here to maintain existing functionality.