Fixes #12424: Account for Normalize change on figure element so that we don't potentially screw folks over