Fix documentation issue and revert automatic code reordering