Revert "retab-ing for now"

This reverts commit df2b9c0e0b025255dbcf51ed1be9dafd21c0a477.