Revert "erroring fixes (maybe!)"

This reverts commit 0740daf5c3077c6122ab180e5f2763a92d055725.