Revert "Merge pull request #23194 from vingtetun/reduce.overpaint.activi...

...ty"

This reverts commit 21876ef6754a28b3bfebb954ffc11469dc4f66f6, reversing
changes made to ce59ac1ae31db296f297ec30090ede3616029f5b.