Revert "Remove places where cat doesn't need to be used"
This reverts commit 127857b20cfdf5bee58599cf8a0bef74d6510fd0.