Revert "Additional change to IS_SUPER_PRIMARY"

This reverts commit c44ee526c56d2f5e680cef24897cff3a922d6a2f.

Change-Id: I2d81fb028eb0672db9cc291ac187c2629435969d
3 files changed