Michael Phelps is kicking an old habit that got him into trouble as he returns to another familiar routine: gearing up for an Olympic run.

Phelps, 30, is the most decorated Olympian of all-time with 22 medals and he recently revealed that he won't consume another drop of alcohol until after the 2016 Summer Olympic Games in Rio de Janeiro, according to the Associated Press.

The 18-time Olympic gold medalist is getting ready for next summer's games and as he prepares to take part in the U.S. championships this weekend in San Antonio, he revealed his new outlook on life.

"Before I even went to court, I said to myself that I'm not going to drink until after Rio - if I ever drink again," Phelps told the affiliate. "That was a decision I made for myself. I'm being honest with myself. Going into 2008 and 2012, I didn't do that. I didn't say I was going to take a year off from drinking and not have a drink."

Phelps was suspended for six months by USA swimming last October after he was arrested a second time for driving under the influence.

The swimmer has since seemed to learn from those mistakes, as he has changed his routine heading into the Rio Games.

Phelps appeared to be done with the sport after the London Olympics in the summer of 2012, but following his six-month suspension he has been committed to returning to the pool.

"If I'm going to come back, I need to do this the right way," Phelps said. "I've got to put my body in the best physical shape I can possibly get it in. Is it a challenge? No. I go to bed earlier. I sleep more. I wake up every day and have a completely clear head. I don't feel like my head went through a brick wall. There are so many positives to it."

While Phelps is committed to changing his regimen, not everyone on Twitter supports him.

For more content, follow us on Twitter @SportsWN or LIKE US on Facebook