No tmp variant of d2

Change-Id: I9049bb47129849a5f994863b8705b8dc75e5fd38