Reverse change and do the right thing

I didn't look close enough at the code to see what it was doing.