Revert "Failed attempt at better tabbing"

This reverts commit 50d26027ae66fbfc9e83fb7e4b7c73bcd91ccc29.