Revert "Listen for the id to change instead of the status"

This reverts commit e3d4786505576d9d3d515134c06dde6064005f70.