Last I heard, I believe the "new" date was somewhere in 2021, but don't quote me.
The whole shooting match was really big tobacco stopping vaping from stealing their market, but since vaping hasn't gone as perceived, I wouldn't be surprised if the legislation died in the annals of history.