revert part of previous commit, instead applying logic directly to current_status calculation where it matters
revert part of previous commit, instead applying logic directly to current_status calculation where it matters

quoideneuf/pop-up-archive,quoideneuf/pop-up-archive,quoideneuf/pop-up-archive,quoideneuf/pop-up-archive