Revert "Fixing shared_ptr that is ambigious under c++11 compilers (like clang on OSX)"

This reverts commit c63156db7cc03e6ad5b5e637d468cf5184db4493.