Merge in fix for loss of MQ

Fix up conflict with earlier attempt at resolving build
issues with MQ