Revert "Build optimization"

This reverts commit bbfb55d4bcb425e9ea53ea526e6e569cb198fc7d.