One more revert, and removing unnecessary line.