We reverted #486 in #493 to unblock a release. We need to re-add this method after we verify upgrades internally.