This according to a live-blogging of Musk's talk at the Detroit Auto show today. I had assumed that this was the case but it's good to hear it confirmed.
Source: http://live.theverge.com/elon-musk-tesla-detroit-auto-show-2015/
Source: http://live.theverge.com/elon-musk-tesla-detroit-auto-show-2015/