Temporary quick-fix for ERRAI-533. We need to think more about which way we want to go with this one.