Revert "This can be moved to Deprecated class"

This reverts commit 995b6556a85f49093ae484b3f83fb086297ba439.

Not worth it.