diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index ec99566dba..74582bc904 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -2763,7 +2763,6 @@ void Buffer::updateLabels(bool childonly) const
 
 	// update all caches
 	clearReferenceCache();
-	inset().setBuffer(const_cast<Buffer &>(*this));
 	updateMacros();
 
 	Buffer & cbuf = const_cast<Buffer &>(*this);
diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 610f71caf8..b30974a401 100644
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -221,12 +221,6 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
 
 	InsetIterator const i_end = inset_iterator_end(in);
 	for (InsetIterator it = inset_iterator_begin(in); it != i_end; ++it) {
-		// Insets store buffer references so need updating.
-		// FIXME This code can probably be deleted. The insets will get copied
-		// when they are pasted, at which point their buffer_ members will get 
-		// set back to zero.
-		it->setBuffer(const_cast<Buffer &>(buffer));
-
 		switch (it->lyxCode()) {
  
 		case LABEL_CODE: {