Revert "Optimize Clang"

This reverts commit 5e41f9f715bd71b85f582bee72afca6e8385368e.

Change-Id: I6edbe08822fed910ce6455fe7c4564c166a0ce75