Reactivate optimization commented out to aid tracking down bugs that are now fixed.