This seems unrelated to your main change.