Revert "Support hoistable / non-hoistable variables"

This reverts commit b8623c209184077568dce431e3bc882eead09a55.
Re-add only fixed tests