Backed out changeset be9be327fb02 (bug 903537)
DONTBUILD NPOTB