Relying on something you might have in the future seems like a bad idea to me. Infrasturcture needs constant improvements if you don'T do anything for years you might end up in a unresolveable mess.