7c61ecbefd
This was originally reverted because of an invalid patch.
This has been fixed and now we want this update again.
This reverts commit e1ed9b3b08.