For ENG-6042, remove suspect optimization
Merge pull request #1228 from VoltDB/ENG-6042

For ENG-6042, remove suspect optimization