This commit undoes the previous refinement and rather documents the original behavior. Issue: SPR-13739