What's the idea behind this change?  Feels completely unrelated to the actual feature in this PR and I don't see any discussion around this change either.