This reverts commit 861e21c612. Failing test While the purpose seems fine, it needs more work
861e21c612