Revert "Compiler optimizations"

Change-Id: Iac3cb28338263a3f7024d000abec02450dadde55