Restore use of default ctor