Rever to 9ce5468e9a85815d352ab770a2b66bd8af6b23eb
Hopefully reverted and this is first update afterwards correctly