Reverted change in scheme setup