Reverted optimization which was causing issues.