I created a dedicated issue to address this problem: https://jira.ez.no/browse/EZP-21752