Little performance improvement.
Revert changes.