Revert MANME-848
Merge pull request #4 from jyang-phunware/master

Revert MANME-848