Remove deprecated settings
Revert "Remove deprecated settings"

This reverts commit 38ba960a06b360ac2577765721811cccf35df261.