Regression in df41b5a05d4e00e80e73afe629072e37873e767a. Backport of 01384ce36c3fddfbcc5af6e1108bdb8cd3e9389d from master