Remove obsolete optimization.

Reverts JB optimization I7ae978caa1f28932ee56f65484b18330a4406b80
made obsolete by I2f9b0591d44599b07bd83f03c4e09e6dd98e1448 in MR1.

Change-Id: I8a738624f9a902648e317f2eac25fd56c3b47a46
2 files changed