Revert "performance improvement" - cause bug with subclasses

This reverts commit 28b8a6e49b23564aa3a968502a14690c15983bcb.