Change 24407

C. Thomas Tyler
Recovering and undoing other changes done in
change @24393 as a quick patch/fix for SDP-341.

Also uncommenting the test for this script as the script is being

Bypassing pre-commit review for this, as I need to commit this before
making the next set of more review-worthy changes, including renaming
this script per discussion in review:
4 edited 1 added 0 deleted
Tip: Use n and p to cycle through the changes.