De-committing based on suggestions from Meatballs1 and jlee-r7.