This patch recommits 126f0374cbc2110aa97e2141ac898014a8b9531a, reverted by 3ada774d0f65b44f21b360d222f446e533df1a34, along with the missing dependence.
This patch recommits 126f0374cbc2110aa97e2141ac898014a8b9531a, reverted by 3ada774d0f65b44f21b360d222f446e533df1a34, along with the missing dependence.