The change in this method seems unrelated. Could you provide a bit more info about why this is needed?