Revert "Mapistore rest fixes"

Reverts openchange/openchange#151

These changes are already part of #164