Revert "properly matching  and , instead of replacing variables". I always get confused with bash, the fact that = == ==

This reverts commit 7596ffa28ab6d3ba382e3e8dac2587a7570b07dd.