Updated returntosourcequeue to look at the new v4 headers, closes #1640