clean up the oh no-ness (bug 870020)