To isolate the code that will be re-written for true vectorized
calculation...

Change-Id: I3ccd15841ed6fcdc6a22a590ba82d46d0b4863c5