Bug 25031: (follow-up) Fix markup error and restore cover class