Revert "Merge branch 'master' of https://github.com/informaticslab/apollo"

This reverts commit f516850fd3fae921e91681053780d72d9fbd3167, reversing
changes made to 3a5017b6956c492a06a8e4c557c00dc27d9af678.