Revert moving of declarations from local blocks.