diff --git a/development/MacOSX/lyxrc.dist.in b/development/MacOSX/lyxrc.dist.in
index 44ac366b47..c67f0afa6e 100644
--- a/development/MacOSX/lyxrc.dist.in
+++ b/development/MacOSX/lyxrc.dist.in
@@ -27,6 +27,7 @@
 \screen_font_roman "Times"
 \screen_font_sans "Helvetica"
 \screen_font_typewriter "Courier"
+\open_buffers_in_tabs false
 
 #
 # COLOR SECTION ###################################
diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 92c95b0d1e..372dcb2963 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -295,12 +295,7 @@ void LyXRC::setDefaults() {
 	converter_cache_maxage = 6 * 30 * 24 * 3600; // 6 months
 	user_name = to_utf8(support::user_name());
 	user_email = to_utf8(support::user_email());
-#ifdef __APPLE_CC__
-	open_buffers_in_tabs = false;
-#else
 	open_buffers_in_tabs = true;
-#endif
-	use_bundled_format = false;
 
 	// Fullscreen settings
 	full_screen_limit = false;