Merge "Revert "Remove many `instrumentation` variables from goto interpreter.""