@yungsters  - personally your approach doesn't seem as flexible for any similar potential future issues - you'd end up with a bunch of if/deletes, but if there's consensus amongst your team that that's how the issue should be fixed then I can update the code.

I just don't want to make the changes and have someone else at FB look at them another week later and come back with more conflicting feedback and still not have this small bug fixed in React.