Revert "Add workarounds for 3rd parties not respecting Class#name"

This reverts commit 17e184efbb411ef5dbf4cb37f68b1bb0940edd98.