Revert "Redmine #5557: Fix promises wrongfully reported with kept status."

This reverts commit 1cb35d8c56a1effd081dc856b7ae2722ac4ed2a8.

The change, while in principle correct, break the test. Need to review
before letting this go in.

(cherry picked from commit 73b553ca9810519f241022c03749ba6f042ff31e)