Revert to only apply defaults when non-null