Revert some kiting changes, update build order goals