Merge branch 'revert-02989976' into 'master'

Revert "Merge branch 'remove-auto-from-insn-temp-var-type' into 'master'"

See merge request !309