Revert "Detect service base directory automatically"

This reverts commit 0a926440e3315f9ab302a22e8ca812e303814866.