Revert "Revert "Removed tabs""

This reverts commit 38b3b2b1e0365416499c59770340ef0f6292fcf9.