this is unrelated to this change, can we keep this out of the diff to avoid confusion?