Revert my previous fix 28763fa020988ec938dae3d47c10be95c87de90e and suppress gcc false positive warnings.