After PR #25 is resolved, we should back out commit 4f1e1524b987f578491557dd4e187d3fe1e63e20, because it could lead to silent data corruption.