This reverts commit ffa918aec6. It was merged incorrectly because I tricked the tests to succeed by accident.
ffa918aec6