bug 838983: cleanups for bug 825471 6a1aacd6b34ec8cfce1fe2875de45279c8254b54