Revert "Try to pollute global namespace less"

This reverts commit f8d6dbbce16d841e916affef30b597802e8a2b1f.