Revert "Second hunk"

This reverts commit fafdb51bcaeb48b27742329c565f15bdfa527c39.