Revert "strictmode fixes"

This reverts commit cb5840791303de88743c3577f96df2a195f57c55.