v.20.5Bug Fix

Revert change from #11079 to resolve #12098

Reverts change introduced in #11079 to resolve #12098. #12397 (Mike).