Revert 8305

[braingram]

This PR reverts #8305

Further testing revealed that issues reported in JP-2943 persisted after the attempted fix in #8305

Regression tests running at: https://plwishmaster.stsci.edu:8081/job/RT/job/JWST-Developers-Pull-Requests/1391/

Checklist for maintainers

• added entry in CHANGES.rst within the relevant release section
• updated or added relevant tests
• updated relevant documentation
• added relevant milestone
• added relevant label(s)
• ran regression tests, post a link to the Jenkins job below.
  How to run regression tests on a PR
• Make sure the JIRA ticket is resolved properly

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 75.78%. Comparing base (2fb073e) to head (ed2e44d).
Report is 27 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #8419      +/-   ##
==========================================
+ Coverage   75.31%   75.78%   +0.47%     
==========================================
  Files         474      476       +2     
  Lines       38965    39424     +459     
==========================================
+ Hits        29345    29877     +532     
+ Misses       9620     9547      -73     

Flag	Coverage Δ		*Carryforward flag
nightly	77.66% <100.00%> (+0.32%)	⬆️	Carriedforward from 2fb073e

*This pull request uses carry forward flags. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.