Fix config conflict (should be unnecessary after fix-ckeditor branch was merged).