revert dragonfire commits