am a87b7e20: Manual cherry-pick of "Remove bookmarks provider..."

* commit 'a87b7e2066601f09d195ea6371978fee84ec6c08':
  Manual cherry-pick of "Remove bookmarks provider..."