Regression in 0899d583bdb140910698d00d17f5f1abc8774b07. Thanks Tim Graham for the review and Jani Tiainen for help. Backport of 024abe5b82d95ee60cb18a77ebf841ad715467fa from master
Regression in 0899d583bdb140910698d00d17f5f1abc8774b07. Thanks Tim Graham for the review and Jani Tiainen for help. Backport of 024abe5b82d95ee60cb18a77ebf841ad715467fa from master