wonder if they’ll backport this to 2.7