clean up and prep for bug 339818
1 file changed