Merge "Revert^2 "Prepare to fail in RefBase destructor if count is untouched""