Revert "We can remove this hack, at least."
Revert "We can remove this hack, at least."

This reverts commit c6e9a6e0cb86e9e30b4b7649606e8998a4461559
as part of a reversion of the cipher suites work.

Lukasa/hyper,lawnmowerlatte/hyper,fredthomsen/hyper,masaori335/hyper,plucury/hyper,fredthomsen/hyper,plucury/hyper,Lukasa/hyper,jdecuyper/hyper,irvind/hyper,lawnmowerlatte/hyper,jdecuyper/hyper,irvind/hyper,masaori335/hyper