The relevant InnoDB/XtraDB fixes up to 5.6.42 had already
been applied to MariaDB in commit 30c3d6db.

Revert some changes that appeared in
the merge commit 87d852f1.