Makes sense, but seems like a separate thing to fix, not related to this change.