You already know this but this is very fragile and adds a dependency on fields we didn\u2019t use before. I believe these might even be the fields Andrew is currently refactoring.    Can we make a proper fix in React itself instead? 