Revert: PLA-539 fix video messages (147543a)