Reverted back fix with core extension update

[Pull request # 3750](https://github.com/yiisoft/yii2/pull/3750) resolves this issue, so the temporary fix for issue #1 is reverted.