This reverts merge request !1007 (merged)
Caused by miscommunication in team and me furiously clicking around ...