Revert "Add htmlOnly argument back-in to maintain compatibility for up-stream PR."

This reverts commit 44814bdae91b7469f3bb80c06cd0a6318eac636e.