Revert "Major update"

This reverts commit 5639d8656195fbeebcea02d10d2b5591fbdd6439.