Reverted back to non-debugging version.