Fixed #24, backout #22. Remove inscope=True.