Partial backout of 1bb829dbd8: the (maintenance) costs of this customization are not worth the benefits
Partial backout of 1bb829dbd8 to stay closer to our custom 1.4 situation