Revert of commit 38fb04fab3e6c094a2325ce5e9d9d34051095c07

because it breaks our application