Revert "Minor peformance improvements"

This reverts commit 0fb4bbe7a483f2e8a9d76c26ccaf1ee575108d00.