transitioning from swaddle

My son is 3 months. Yesterday his pediatrician suggested we stop swaddling him at night since he'll roll over soon. We tried not swaddling him last night and he was up crying all night. As soon as we swaddled him he was calm and fell asleep. So what do we do to get him to be calm and comfortable sleeping without the swaddle?  Anyone else have this issue?