QPID-5676: revert r1586026, taking a different approach to equalise the builds

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