Drop options_preferences_file.patch, fixed upstream.