Just need to update Pay to fix this. While working on this however it would be worthwhile to update to Pay 3.x which makes architectural changes.