This patch recommits 126f0374cb, reverted by 3ada774d0f, along with the missing dependence.
126f0374cb
3ada774d0f