e0ba6099df
This reverts commitc59d406e84, reversing changes made toae73151e4a. Reverting on staging-next branch, moving to staging. Unfortunate clash with PR #285158 triggered a stdenv rebuild.