Recommit; now with correct default settings.