Gittrac #4550:  More Stork-related code removed.