Revert "Maybe broken"

This reverts commit e1a476f725c04d3045afe725dd0c30de4ee3991c.