Fix wrong backport in changeset ab434ea570f2