Restore buildability for DragonFly (with some limitations)