Plan C in action.. Strict aliasing from 2 to 1

Change-Id: Ic292ce74860cdaa87364d8cb1c396d26d029eef8