* commit 'bb1b7d5cb3c5502484269bfd0cdcd0d5a6d6bfad': Bug 5478024 drop after decode if can't drop before