Revert "Fixed build issues."

This reverts commit 61bb65364ec5f17b50b3cb26b69cfaec295c3ab5.
Updated dependencies.