Backport 2e5daf7940b0eb3827bdb55e79f6f9d7759bb2ea from 2012

This removes a config option previously removed 7 years ago by 4071c8717a23db909dca4df01692f157e58344d1