Reverting "Update to provider locator."
Revert "Update to provider locator."

This reverts commit 0cd7395a798f1c8e200abf6146c97564d313f93d.