Reverting NoMoreUnprocessedHarException changes