Bug 838005 - Removed Comment in action handler