(Step 5 in parent issue #3319.) Was added by @slevis-lmwg in #2445 to fix #3313, but a more proper fix was implemented in #3314. Must happen only after #3322; see parent issue #3319 for details.