Remove graphite flags from cherry-picks from daeiron's fork of pimped