Revert "Still broken"

This reverts commit 6553131fdb5168e22bc704de6eb00bc568771645.