Revert "Switching to a better methodology for class calls."

This reverts commit e6c65869a6237435af50f8ffb96e8c29eb5b54a0.