Revert "Merge pull request #344 from johnnyshields/graphite-sec-grp"

This reverts commit 692632090041d19c65820e4f8f273201058bded0, reversing
changes made to 22dddceb937899401c2fd12c021f2812ecc09bcf.