Revert "Makefile sts=4, ts=4"

This reverts commit bd6c82ec9a26ace91bff63e917e8aee5468542d3.