Reverting code cleanup unrelated to my changes