diff --git a/src/cpp/ripple/TransactionEngine.cpp b/src/cpp/ripple/TransactionEngine.cpp
index c2eca65f33..7a3af2d4cb 100644
--- a/src/cpp/ripple/TransactionEngine.cpp
+++ b/src/cpp/ripple/TransactionEngine.cpp
@@ -93,8 +93,8 @@ TER TransactionEngine::applyTransaction(const SerializedTransaction& txn, Transa
 	}
 #endif
 
-	Transactor::pointer transactor=Transactor::makeTransactor(txn,params,this);
-	if(transactor)
+	std::auto_ptr<Transactor> transactor = Transactor::makeTransactor(txn,params,this);
+	if (transactor.get() != NULL)
 	{
 		uint256 txID		= txn.getTransactionID();
 		if (!txID)
diff --git a/src/cpp/ripple/Transactor.cpp b/src/cpp/ripple/Transactor.cpp
index fd187ab396..ff57daff5e 100644
--- a/src/cpp/ripple/Transactor.cpp
+++ b/src/cpp/ripple/Transactor.cpp
@@ -11,26 +11,26 @@
 
 SETUP_LOG();
 
-Transactor::pointer Transactor::makeTransactor(const SerializedTransaction& txn,TransactionEngineParams params, TransactionEngine* engine)
+std::auto_ptr<Transactor> Transactor::makeTransactor(const SerializedTransaction& txn,TransactionEngineParams params, TransactionEngine* engine)
 {
 	switch(txn.getTxnType())
 	{
 	case ttPAYMENT:
-		return( Transactor::pointer(new PaymentTransactor(txn,params,engine)) );
+		return std::auto_ptr<Transactor>(new PaymentTransactor(txn, params, engine));
 	case ttACCOUNT_SET:
-		return( Transactor::pointer(new AccountSetTransactor(txn,params,engine)) );
+		return std::auto_ptr<Transactor>(new AccountSetTransactor(txn, params, engine));
 	case ttREGULAR_KEY_SET:
-		return( Transactor::pointer(new RegularKeySetTransactor(txn,params,engine)) );
+		return std::auto_ptr<Transactor>(new RegularKeySetTransactor(txn, params, engine));
 	case ttTRUST_SET:
-		return( Transactor::pointer(new TrustSetTransactor(txn,params,engine)) );
+		return std::auto_ptr<Transactor>(new TrustSetTransactor(txn, params, engine));
 	case ttOFFER_CREATE:
-		return( Transactor::pointer(new OfferCreateTransactor(txn,params,engine)) );
+		return std::auto_ptr<Transactor>(new OfferCreateTransactor(txn, params, engine));
 	case ttOFFER_CANCEL:
-		return( Transactor::pointer(new OfferCancelTransactor(txn,params,engine)) );
+		return std::auto_ptr<Transactor>(new OfferCancelTransactor(txn, params, engine));
 	case ttWALLET_ADD:
-		return( Transactor::pointer(new WalletAddTransactor(txn,params,engine)) );
+		return std::auto_ptr<Transactor>(new WalletAddTransactor(txn, params, engine));
 	default:
-		return(Transactor::pointer());
+		return std::auto_ptr<Transactor>();
 	}
 }
 
diff --git a/src/cpp/ripple/Transactor.h b/src/cpp/ripple/Transactor.h
index 1c456637df..62d2a5e455 100644
--- a/src/cpp/ripple/Transactor.h
+++ b/src/cpp/ripple/Transactor.h
@@ -33,7 +33,7 @@ protected:
 public:
 	typedef boost::shared_ptr<Transactor> pointer;
 
-	static Transactor::pointer makeTransactor(const SerializedTransaction& txn,TransactionEngineParams params, TransactionEngine* engine);
+	static std::auto_ptr<Transactor> makeTransactor(const SerializedTransaction& txn,TransactionEngineParams params, TransactionEngine* engine);
 
 	TER apply();
 };