They now charge $3000 for autopilot across all models, including S and X.
But this is now called "Autopilot", and is just traffic-aware cruise-control plus lane keeping. The no-longer-offered $5000 version was called "Enhanced Autopilot", and also included "Navigate on Autopilot", Summon, and...