Fallout from making create and drop primitives hard-edged

Change-Id: I366c3b9296e0d6a09e85c6eeddc7d14d061b9d69