Strict Aliasing Fix

Change-Id: Iebd61ca581c558f7097cf4db85360fb9c50a2db3
Revert "Fix for now, will need to revisit"

This reverts commit 46fc23244c2af9e8c7535824d23fb2b7c9a6023f.