Revert "Numerous changes"

This reverts commit 02bb32b340a92b31665c290cffecb0876aee3f1d.