This is purely a "move HTML around" commit; nothing should have changed. (imported from commit 09968a0e838cbdff86cd824ab9c0fb39d20c78f3)