Minor improvement.
Revert minor improvement.