Revert "[Poshuku Keywords] Removed pre-automoc stuff."

This reverts commit e5c19d99884f38a0eb8db4d8fe29ddb6597d7932.
[Poshuku Keywords] Properly removed automoc stuff this time.