Revert "I think something is broken"

This reverts commit 9684bb3821e5834ee30e9ca0bbbcd6b452b34367.