Backport bug 1048426 — Fix callType storage