Optimizing is back...

Change-Id: Ic2d420099721aebcd342621bbb34f691897fe3f3