Reverted an unnecessary scope change