revert part of mr !526 to allow retrieval of const services

revert part of !526 (merged) to allow retrieval of const services, until we have a more c++17 solution...