rollback of earlier service discovery commit (--> this is not yet ready
and will be further pursued in a separate branch before coming back to
the master branch)