Add back amqp and platform choice

cc @sseago