Revert "Debug"

This reverts commit ecb95fce888298ccd4fcc10a9358acce2e8828ca.
Revert "Try to resolve generation2 issue"

This reverts commit 38b7ebcb56b5205ca4e8ed655beaa1e1e29b3906.