Revert "Merge commit '0767f0e4e32e05a02898be8f38bab0ddc785173e' into tests-assembler-generation"

This reverts commit d9547c1c7d1bccd4e496eb1e2f146a7a2675c9d0, reversing
changes made to 6a478bdbba7c89e8b659f6afc4fe22191ccb2042.