This reverts commit b20bce8ce5. It retains the test added in that commit as a check-pass test, intended to prevent future (unintentional) regressions.
b20bce8ce5