Revert the commit because the std::function was not appy and a bad_call was thrown when attempting to delete the unique_ptr...
