most recent changes needed to match up with new Metacello