Rolled back a modification that caused unreasonable out of memory exceptions.