Rolled back dubious fix