433dbeb149
This reverts commit 12a413bf024e64946b28ed9aa3065a31b9420ad2 as it needs some more changes due some changes that were merged into 4.1 before.