When will powerbi.com replace PowerBI on Office365?

So we use Office365, and have access to 'PowerBI' through that, but it's the old Sharepoint-based version.  At GA, will PowerBI.com replace the old version in Office365?  It's very confusing to have ...