Fixed bug in last Commit

I accidently introduced a bug in my last commit when cleaning up the
code. Oops! This adds back the lines I shouldn't have deleted.