Revisiting non-Gaussianity from non-attractor inflation models