Revert 67733 changes, and add a comment indicating I'm the maintainer.
A more complete update will follow shortly.