Revert "hoping this works in one shot"

This reverts commit 673ffce54f1c7a360619764d9baf1e3bdcd7e624.