Revert "Two REMOVE_PROVIDER messages caused by race condition."

This reverts commit 76bbc72a701d4003590b23dad12e99b98be8b234.

Change-Id: I9a505bc5c7d398650e20f123c63b7400500e41e6