Good catch here. I think this might be the only change from this PR that is still needed.