Attempt to fix build on < 11.0-CURRENT