CR fixes.
Reverted mistake.