Upgrade to v4.0.31 and remove /packages