Yahoo might not spin off Alibaba after all