MS-112: Stop using HTML5 elements for now