Issues in JIRA to fix this: https://jira.ez.no/browse/EZP-21553