Revert "4.21 Fix"

This reverts commit 769d3eb182e588c18ca131ee94372fa7016764b9.
Updated for 4.21