This reverts commit d895fc9ac0 since the test is problematic as described in the ticket. Backport of dfbdba924f from master
d895fc9ac0
dfbdba924f