Reworked for better repoman integration.  No import on form chunks.