Revert "Replace "," with "SPC"."

This reverts commit 97efb10c39e486625ba43488872b4c8fb7fc7674.