Revert "Merge pull request #26 from gbehrmann/fix/2.2/rb5546"

This reverts commit a497d4c55de2375372dd3aa7a0c1c5cd99bb3732, reversing
changes made to b9186d751b5e24c91e34d992da75072c7652927a.