I'm reverting this change because locally I didn't need it

I'm not sure that this one change is needed to get things
working and I'd rather not change this code unless we
really need to.

Will talk to the original author and figure out if its needed