Revert "try to automate more"

This reverts commit 290f4b188f65a7cda1daeb50b83d76daf5db8ce6.