Revert "Build cleanup, will be reverted after build."

This reverts commit 93e5d9d276cb420a78466618d4f7aaf9b5041b81.