Bug 944299 - 2/N: remove non-goldfish bits