Revert "fixing BR #264 (core crash after join)"