just noticed that Canary (117) is already dropping both, so when that version is pushed to stable it's RIP.