I don't think this should be the default. Let just stick with the current scheme.