Killed optimizing for good

Change-Id: I292ca982f12b1b8014d6298fd6c39ed60782093b