Reverting to old code.

- Removed not working code.
- Uncommented.