Revert "Fix cipher suite for puppet2"

This reverts commit 32b23390687264fe55fac46845eb6d7af68053d4.