I was preparing to revert and refix for 2.3, but
then I see nobu working on r48849, 48850, r48851...
I guess nobu is fixing this problem?