This reverts commit 6911114d8cbed06a8a809c34ae07f4e3e89ab252. Broke the QEMU sanitizer bots due to a missing header dependency. This actually needs to be fixed on the bot-side, but for now reverting this patch until I can fix up the bot.