Revert "Merge pull request #94 from aarondav/mesos-fix"

This reverts commit fe974ba1484dbe6fffdae8680b3b37b26de83145.

The commit only applies to 0.9, not 0.8.x.