Revert make_shared<> change which breaks build on some platforms; don't know why...