Rolling Over - Back to Tummy

My son rolled over from back to tummy at 3.5 months old. He's 4.5 months old now. When he gets on his tummy he has no desire to try to roll back but instead wants to try to crawl and then of course gets super frustrated that he can't yet. This means that when he rolls on to his tummy at night when he's fidgety he starts screaming and yelling. Any advice? I've watched him on the monitor to see if he'll figure it out on his own but he doesn't. Did anyone elses baby do it this way first?