Revert "Further improve on HelpManager"

This reverts commit e4ab1ca2f096081701975c729b7d65ef0b638c7b.