This seems pretty unrelated to the rest of the changes and should probably be a separate PR as a result, I think.