Add config option to recover from BC bug