Bug 5535994 cleanup.