reverting redirect handling change