So ... this applies on top of ae7dcab5ed1882b6115c9fe3ab7894a8b6a7e9eb but not with 899613f5351642c8257401054fef5f25725af172. Are we sticking with the reverted version for release, or applying 35310 atop 34476?