BUG#487 Use Wil's custom function to replace HTML comments instead of