Revert "more updates break everything"

This reverts commit 770c7a56c7ae1682eb82ee71ceeafa5fe5107adc.