Bug 836930
- Removed unnecessary listener