See !407 (merged). This is a 2.58 backport.
Please review !407 (merged) instead, and only merge this when both are ready.
