Follow up issue https://github.com/yiisoft/yii2/issues/2359