[Phpmyadmin-git] [phpmyadmin/phpmyadmin] cea9aa: Revert c9c280e9921d and b39933c37b8c