This was originally reverted because of an invalid patch. This has been fixed and now we want this update again. This reverts commit e1ed9b3b0851b95d3e82fb1085a121531c32a42a.
Need to fix a patch first. Next iteration. This reverts commit 507efdb11fcdbf59199b2fe4717d6799ff623a2a.