Reverted to 1.7; removed plugin-specific prefs