Revert "Fix for JIRA https://issues.apache.org/jira/browse/STORM-585"

This reverts commit 6463f6cbe3b460005a749509e0ac86487728dac9.