Use less hackery.
Merge pull request #47 from jordandukart/7.x

Use less hackery.