Revise (according to @hartwork's plan) nearer to original code (#204)
Revise (according to @hartwork's plan) nearer to original code (#204)

This reverts commit 3f5b1cfa75fc0f12432cdfeafd4fce1eea38a81f.

libexpat/libexpat,libexpat/libexpat,libexpat/libexpat,libexpat/libexpat,libexpat/libexpat,libexpat/libexpat