reverting package inclusion for now