Do you mind adding some inline comment on why we are doing this? (basically your pull request description)