CHtml changes introduced in #2186 reverted.

CHtml changes introduced in #2186 reverted.

@qiangxue's comment: https://github.com/yiisoft/yii/pull/2186#discussion_r3311656