Revert "patch to get up to newer (3.0.x) rabbitmq releases"

This reverts commit 61efae3b14f6886106357c25db1ee22806d64c34.