Revert "[3.0] Changed styles to use case-insensitive matching"