reverted to old packaging scheme