Change default behavior back to scoped rather than fanout