151d745922
Don't require advanced config for people who want to disable
(cherry picked from commit f83e607e6e)
Don't require advanced config for people who want to disable
(cherry picked from commit f83e607e6e)