Merge pull request #2599 from Evanfeenstra/peel-onion