As we have no defaults now, we may as well remove this "override defaults" pattern.