When did you stop swaddling?

We recently stopped swaddling and I’m instantly regretting it. My boy is a little over 4 months and constantly wakes himself up all night long jerking his arms and legs. He never woke up when swaddled and would sleep from 930pm to 5 am or later. Now he wakes up all night long and it’s so difficult to get him back to sleep. He’s shown no signs of trying to roll over yet so I’m wondering if I can just go back to swaddling him a little longer. We swaddled one arm out for 2 weeks and then swaddled just around his chest before we committed to no swaddle. The one arm out worked, but it’s been horrible since. We’re using the Merlin sleep suit now and it’s not helping.