x86: Fix up the MFC of 08161fd3b207105847bdd1dd8729ea4cbda6e537
This is a direct commit to stable/13.