This looks like a regression, unless we changed how these properties are set to just `null` with a different fix than the one I took a few months ago?