Bug 972475 - [System] Fix removal of event listener.