Revert "fix aliasing"

This reverts commit 0b2c32d382b13604fa28f97dc613a68229e1b4d3.
mm k

Change-Id: I88bd53a774a8986accbc631befc86aea40e86122