Revert "WIP update"

This reverts commit 47af0cc3e11c3d82800a31b4f7013deea1404120.