Reversed previous changes.
Reversed previous changes to fix a bug.