!UPSTREAM: try to fix 53077

TODO:
- Test on HSW
- Comment better