Removing system property use in favor of a simple mutator.