Revert "Expose more stuff for automation"

This reverts commit 4d8aa992b7a288cd255838d6f8a6581773f783f8.