Revert "Radical updates"

This reverts commit a690f53141ba3dbd4b537384b18d7d1d8a42337d.