(bug 16497) Cut down on heavy memory usage here