This reverts commit c1d014a975. The patch was included in 0.8.0 and now was failing to apply.
c1d014a975