Rolling back Spring (manually this time). Need to keep things simple for now. Maybe later...