Remove obsolete check

Change-Id: I61e7fbe18fc01b3eb30bc08bb901ed228e868770