If's awful. We can make it obsolete in the next release and remove in the release after next.