Bad understanding of intents behind that setting, my mistake. This reverts commit 49f530c7da.
49f530c7da