Revert "Merge branch 'discovery' into 'master'"

This reverts merge request !34 (merged) while we fix #35 (closed) and #36 (closed).

Since most users will use the version from master, this should prevent the broken version from making it to too many users.

/cc @rabidaudio