Revert "try out some different make optimizations (o3, etc.)"

This reverts commit 745d7b66076eb08fe9848918478778f8c4b9eed3.