diff --git a/indra/newview/rlvlocks.cpp b/indra/newview/rlvlocks.cpp
index 3818735d80..fd70a60c44 100644
--- a/indra/newview/rlvlocks.cpp
+++ b/indra/newview/rlvlocks.cpp
@@ -922,15 +922,7 @@ RlvFolderLocks gRlvFolderLocks;
 RlvFolderLocks::RlvFolderLocks()
 	: m_fItemsDirty(true)
 {
-	//LLOutfitObserver::instance().addCOFChangedCallback(boost::bind(&RlvFolderLocks::onCOFChanged, this));
-}
-
-// static
-void RlvFolderLocks::initClass()
-{
-	// this can not be called from constructor because its instance is global and is created too early.
-	// Subscribe to "COF is Saved" signal to notify observers about this (Loading indicator for ex.).
-	LLOutfitObserver::instance().addCOFChangedCallback(boost::bind(&RlvFolderLocks::onCOFChanged, &gRlvFolderLocks));
+	LLOutfitObserver::instance().addCOFChangedCallback(boost::bind(&RlvFolderLocks::onCOFChanged, this));
 }
 
 // Checked: 2010-11-30 (RLVa-1.3.0b) | Added: RLVa-1.3.0b
diff --git a/indra/newview/rlvlocks.h b/indra/newview/rlvlocks.h
index abd2fc9cb0..072b9f7229 100644
--- a/indra/newview/rlvlocks.h
+++ b/indra/newview/rlvlocks.h
@@ -291,7 +291,7 @@ extern RlvWearableLocks gRlvWearableLocks;
 // RlvFolderLocks class declaration
 //
 
-class RlvFolderLocks: public LLInitClass<RlvFolderLocks>
+class RlvFolderLocks
 {
 public:
 	RlvFolderLocks();
@@ -301,8 +301,6 @@ public:
 	// Couples the folder lock source with the type of lock (false = folder node ; true = folder subtree)
 	typedef std::pair<rlv_folderlock_source_t, bool> rlv_folderlock_descr_t;
 
-	static void initClass();
-
 public:
 	// Adds an eLock type lock (held by idRlvObj) for the folder(s) described by lockDescr
 	void addFolderLock(const rlv_folderlock_descr_t& lockDescr, const LLUUID& idRlvObj, ERlvLockMask eLock);