Switch to use defaultValue.