Fix #1094
Merge pull request #1140 from JabbR/fix-disablable-content-providers

Fix #1094