Gittrac #4550:  First phase of taking out Stork-related code.