Revert "Schiff 2"

This reverts commit 95b25fecc450483bb30beab59d29b38418f389e8.
Revert "Revert "Schiff 2""

This reverts commit 49fc688158188797eaf206ff662e8dd836e792e4.