Does the 4 month sleep regression ever end?

My daughter used to sleep all night up until she was 4 months old...now we are going on almost a month of not sleeping at night and 30 minute cat naps during the day. She was starting to kick out of her swaddle and was getting too big for the rock and play so we tossed both of those. Now she is sleeping in a pack and play in our room (shes not the best at rolling yet so I don't feel comfortable leaving her in the nursery) and swaddle free (she hated the wearable blanket we tried). I am out of ideas! She wakes up every 2 hours if not more and kicks her legs! I even so much as broke the cardinal rule and put her on her belly! The only way she will take more than a short cat nap is if I hold her! Please help! What has worked for you mamas?