Switch back to tracking scala master.