Implementing #4749 has resulted in not using the server-generated name for a local variable. This feels worse than the behaviour before, so we should revert it and re-opened it to come up with a better solution.