Revert "Merge pull request #1 from phpne/develop"

This reverts commit ba5fded2050c7ba82c012396b9e65da4e8a47c98, reversing
changes made to f2a92ebdb91e9ce957f3869014ad9b7d51f500f9.