Revert "performance hacks"

This reverts commit 3eb13766909cb46b122b00bb78a4d68e4e0c3182.