Revert "Fix some cukes failing due to upper case conversions"

e4b85705 provides an alternative solutin to make these features less
brittle.

This reverts commit 3373f77556bc4ff38ba4e9c2a1921428f5716ed7.