back out change; avoid performance issue