Comeback likely in April, 2-wheelers may be left out