Revert "Fixed SafeCatch using but not requiring current_ruby"

This reverts commit 3b3b9de5802f04974496fc182423b739852b97ad.
Merge branch 'master' into ssh_auth