Revert "Rebuilt changes"

This reverts commit 443f2675e18d8c07e8e09903325f1e6c9eca9b9c.