Revert "!smoke stuff"

This reverts commit 4a6f9ec0fce66106749174ab87cdebf09dbf4fd2.