Upgrade to v4.0.35 and remove /api hack