Undoing a hack that was put in a little while back