a8086cf9df
This reverts commit e6c02aad93.
Keeps the code improvements from the PR and the test (as a known-bug).