This reverts commit 1488d88c81c4b8a31f96c0fb1045f3328302b2e2. Wrong branch was accidentally merged. There is a better test.