Revert "Cause who likes CSTs anyway?"

This reverts commit be96516fa923f09556b471d9de5dcab0b25de1d3.