This reverts commit 5a0dcd3c20. Same as 6ad6df59b5 Was mistakly merged, should not be integrated into stable
5a0dcd3c20
6ad6df59b5