Replaced Derek Higgin's qpid module with that of Dan Prince