Revert "Revert to old behaviour regarding information requests"

This reverts commit c98181c4a48c57e405effd1dc9046aaaee6d480f.