Revert "Broken :-("

This reverts commit 990501670253291426402e387152f739c10b3633.
Test failure