This alter breaks things, let's not do it.
Merge pull request #8 from jordandukart/7.x

This alter breaks things, let's not do it.