How to break the swaddle habit: Tips?

My 5 and 1/2 month old still NEEDS to be swaddled to be able to sleep at night. He can't roll from back to stomach yet, but when he does I don't want to be swaddling him anymore. Any ideas on how to break the habit?