32755 [Backport bug 32754 to 4.0.0.1] backout 18704 (causes 32680)