Revert "Catching up with KellyElton Base"

This reverts commit 879622c7b3fb90c94cba0056c647313359da723d.