Revert "Merge branch 'sprk' of github.com:CreativeMobile/socmap-mp into sprk"

This reverts commit ead7ca83deb0f2257aa0c283dd3c89c70a3b1e8c, reversing
changes made to 8f67ee6c9741ec401c1b030d5d67c3a16418d5bf.