Revert "skip anvil steps that slow things down"

This reverts commit f78460e2a70a35e441ff8cce7aba84c44dc8a332.
Merge remote-tracking branch 'upstream/master'