* Temporary work-around for losing the shared-pointer.