Revert.
Merge pull request #510 from nZEDb/dev

Revert.