fa80945269f312bc609e8384302f58b03c916e12 from Linus’ branch applies to the current lucid branch cleanly when cherry-picked.
fa80945269f312b c609e8384302f58 b03c916e12 from Linus’ branch applies to the current lucid branch cleanly when cherry-picked.