Revert "Attempt to speed $super"

This reverts commit 4bb8c16f7c7b2a5fadc442bc94e3bd916c17150e.