I think we want this enabled by default?