Worked in 5.0.1 but broke in 5.1
This is a follow-up of dmx-intern/sprint-planning#263
@sme @mukil @irau FYI