Revert "Merge pull request #1 from secoint/1-3-dev"

This reverts commit f54282d595782f41924611c3dd16a3918d3bf552, reversing
changes made to 447748e1157cc64b545fe4cb982c2e30607ebfac.