This reverts commit 760c99fca9369014fd34ad550171de3b5a521add. No longer needed since gcc-7.2.0 was fixed.