Revert "Merge pull request #130 from UI/ishmulevich/review-pending/apply-type-checking-to-ServiceLocator"

This reverts commit 826d681ee34227a73dc59ca3cee4be35f06c1290, reversing
changes made to d7becc0bae0551a103f87f7f740e97742b761582.