Revert "wrong"

This reverts commit 723ee734fec4a932258991129467100313dc8b4b, reversing
changes made to 57430b1058ea2f6b40d19a1c1642934b12e3bae0.