Revert "Merge pull request #8450 from comoyo/dont_scare_users"

This reverts commit 8b1bf134477fb8680fa265d2b0d6071af57ef3b8, reversing
changes made to b2fbc099788f38f9dafaf5a87cdac30623c9a728.