Reverted premature optimization

This reverts commit 3376285dba91c04608d9d9eb6a5fb9c440104a9d.