[misc] Revert "final" class change, since this is an API breakage