Changes introduced in #2186 reverted.

Changes introduced in #2186 reverted.

https://github.com/yiisoft/yii/pull/2186#discussion_r3311656