This partially reverts commit 8a42e3d3ef.
Comment improvements and the test case were kept, with one part commented out.
This partially reverts commit 8a42e3d3ef.
Comment improvements and the test case were kept, with one part commented out.