Revert back to a stable state.
Merge pull request #13 from jordandukart/7.x

Revert back to a stable state.