Revert "Another commit to pass the build"

This reverts commit 5b2e2517b0f087281278037356e5271682180402.
Revert "Fixed the failing test issues"

This reverts commit 08d616ad5f341f7782428c5b77b4d4d26950bd69.
This reverts commit 5b2e2517b0f087281278037356e5271682180402.