I'm concerned that the current fix might have some undesired side effects
messagingframework!1 (bca0e217)