reverted change for am_scoping