v.20.6Bug Fix

Reverted Change from #11079 to Resolve #12098

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