Untested fix for >= bonaire.