Revert #3108 - fixes #3122 back button bug

[benfrancis]

Unfortunately the fix for #3056 caused #3122.

We'll have to find another way to fix #3056.

[codecov-commenter]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 62.90%. Comparing base (d6f1bf4) to head (fe2b50d).

❗ Current head fe2b50d differs from pull request most recent head aa40b24. Consider uploading reports for the commit aa40b24 to get more accurate results

Additional details and impacted files

@@           Coverage Diff           @@
##           master    #3123   +/-   ##
=======================================
  Coverage   62.90%   62.90%           
=======================================
  Files         118      118           
  Lines        9014     9014           
  Branches     1709     1709           
=======================================
  Hits         5670     5670           
  Misses       3098     3098           
  Partials      246      246           

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