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

Revert MANME-848