I created bug 956254 (cc @akatsoulas) to track this. Since this functionality is not related to this pull request, I suggest we move forward as is and we re-add the code when we fix the new bug.