Revert "Drop subpackage tag, replace with new package tag"

This reverts commit 47f447d766b6a19d81c21d03dd5c2ad04d723bd8.