To keep backwards-compatibility we should set this to false?