Revert "Fixed faky issue"

This reverts commit 944e5771c75a85fb7ab0dbfba982f07a86f75eb9.