Revert "Issue #2731801 by ajalan065, eugene.ilyin, penyaskito, naveenvalecha: Use of services to access functions" This reverts commit bfdfc33b.
