workaround needed cos we are bypassing normalization

Change-Id: I95c42674e48623fded73ef18402e6c75912c3037