Reverting last edit.
Merge pull request #654 from jaredbischof/develop

Reverting last edit.