This reverts commit 716dfa67a3, since it was later fixes differently with c6b55e45e9256bb41b2d045d8c61d1946de881b1...
716dfa67a3