This reverts commit 3a6f63f34f.
(The issue wasn't xbyak but rather cherrypick order wrt to
other commits, xbyak upgrade was a red herring)
This reverts commit 3a6f63f34f.
(The issue wasn't xbyak but rather cherrypick order wrt to
other commits, xbyak upgrade was a red herring)