Close GH-887: Fix to reuse HTML5 tech (2). Fixes #884