Revert "to3"

This reverts commit c706d879be689503f25a7500a0015e804478e440.