diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index a7bca7bd37..bdf866fbe1 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -531,9 +531,8 @@ bool Buffer::readDocument(Lexer & lex)
 	BOOST_ASSERT(paragraphs().empty());
 
 	readHeader(lex);
-	TextClass const & baseClass = textclasslist[params().getBaseClass()];
-	if (!baseClass.load(filePath())) {
-		string theclass = baseClass.name();
+	if (!params().getTextClass().load(filePath())) {
+		string theclass = params().getTextClass().name();
 		Alert::error(_("Can't load document class"), bformat(
 			_("Using the default document class, because the "
 				     "class %1$s could not be loaded."), from_utf8(theclass)));
diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index e566cdd822..b78056b529 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1227,18 +1227,17 @@ void BufferParams::setTextClass(TextClass_ptr tc) {
 
 bool BufferParams::setBaseClass(textclass_type tc)
 {
-	bool retVal = true;
-	if (textclasslist[tc].load())
-		baseClass_ = tc;
-	else {
-		docstring s = 
-			bformat(_("The document class %1$s could not be loaded."),
+	if (!textclasslist[tc].load()) {
+		docstring s = bformat(_("The document class %1$s."
+					"could not be loaded."),
 		 from_utf8(textclasslist[tc].name()));
 		frontend::Alert::error(_("Could not load class"), s);
-		retVal = false;
+		return false;
 	}
+	
+	baseClass_ = tc;
 	makeTextClass();
-	return retVal;
+	return true;
 }
 
 
diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index d26b4dffeb..fe2369cac8 100644
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -374,7 +374,6 @@ void LyXAction::init()
 		{ LFUN_LISTING_INSERT, "listing-insert", Noop },
 		{ LFUN_LAYOUT_MODULES_CLEAR, "layout-modules-clear", Noop },
 		{ LFUN_LAYOUT_MODULE_ADD, "layout-module-add", Noop },
-		{ LFUN_LAYOUT_RELOAD, "layout-reload", Noop },
 
 		{ LFUN_NOACTION, "", Noop }
 	};
diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index ff466d0323..2dc4086bb4 100644
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -731,7 +731,6 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
 	case LFUN_BUFFER_PARAMS_APPLY:
 	case LFUN_LAYOUT_MODULES_CLEAR:
 	case LFUN_LAYOUT_MODULE_ADD:
-	case LFUN_LAYOUT_RELOAD:
 	case LFUN_LYXRC_APPLY:
 	case LFUN_BUFFER_NEXT:
 	case LFUN_BUFFER_PREVIOUS:
@@ -1836,18 +1835,6 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 			updateFlags = Update::Force | Update::FitCursor;
 			break;
 		}
-		
-		case LFUN_LAYOUT_RELOAD: {
-			BOOST_ASSERT(lyx_view_);
-			Buffer * buffer = lyx_view_->buffer();
-			TextClass_ptr oldClass = buffer->params().getTextClass_ptr();
-			textclass_type const tc = buffer->params().getBaseClass();
-			textclasslist.reset(tc);
-			buffer->params().setBaseClass(tc);
-			updateLayout(oldClass, buffer);
-			updateFlags = Update::Force | Update::FitCursor;
-			break;
-		}
 
 		case LFUN_TEXTCLASS_LOAD:
 			loadTextclass(argument);
diff --git a/src/TextClassList.cpp b/src/TextClassList.cpp
index bfda9d35d5..aee1144668 100644
--- a/src/TextClassList.cpp
+++ b/src/TextClassList.cpp
@@ -66,12 +66,11 @@ TextClassList::numberOfClass(string const & textclass) const
 TextClass const &
 TextClassList::operator[](textclass_type textclass) const
 {
-	if (textclass >= classlist_.size())
-		return classlist_[0];
-	
-	//FIXME I don't believe the following line is actually necessary (rgh)
 	classlist_[textclass].load();
-	return classlist_[textclass];
+	if (textclass < classlist_.size())
+		return classlist_[textclass];
+	else
+		return classlist_[0];
 }
 
 
@@ -176,16 +175,6 @@ bool TextClassList::read()
 }
 
 
-void TextClassList::reset(textclass_type const textclass) {
-	if (textclass >= classlist_.size())
-		return;
-	TextClass const & tc = classlist_[textclass];
-	TextClass tmpl(tc.name(), tc.latexname(), tc.description(), 
-	               tc.isTeXClassAvailable());
-	classlist_[textclass] = tmpl;
-}
-
-
 std::pair<bool, textclass_type> const
 TextClassList::addTextClass(std::string const & textclass, std::string const & path)
 {
diff --git a/src/TextClassList.h b/src/TextClassList.h
index 740b87f536..6f8f963fc5 100644
--- a/src/TextClassList.h
+++ b/src/TextClassList.h
@@ -50,9 +50,6 @@ public:
 
 	/// Read textclass list.  Returns false if this fails.
 	bool read();
-	
-	/// Clears the textclass so as to force it to be reloaded
-	void reset(textclass_type const textclass);
 
 	/// add a textclass from user local directory.
 	/// Return ture/false, and textclass number
diff --git a/src/lfuns.h b/src/lfuns.h
index 299166c6a2..4a6295abf6 100644
--- a/src/lfuns.h
+++ b/src/lfuns.h
@@ -402,7 +402,6 @@ enum kb_action {
 	LFUN_PARAGRAPH_PARAMS,           // rgh, 200708XX
 	LFUN_LAYOUT_MODULES_CLEAR,       // rgh, 20070825
 	LFUN_LAYOUT_MODULE_ADD,          // rgh, 20070825
-	LFUN_LAYOUT_RELOAD,              // rgh, 20070903
 
 	LFUN_LASTACTION                  // end of the table
 };