This reverts commit c10a1c6e1c. Not needed anymore since the issue is fixed properly in 23cc97f16b.
c10a1c6e1c
23cc97f16b