Temporarily remove static declaration until MDL-40935 is integrated