Bug 938472 - Modify usage of Pair / Unpair because of interface change