Merge "Undo stable backports"