QPID-5714: Revert change that I intended for trunk (it still needs approval)

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.28@1588879 13f79535-47bb-0310-9956-ffa450edef68