Should we try/expect the handling flags to be removed?