Revert "RANDOM: full sync with 3.10.y + hacks :)"

This reverts commit 87fbd6fcf5afbd458f44d9cc0d1a1aba168347a8.