Temporarily revert 0f4e573b1e0b, until further investigations on test failures
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin