Revert "Attempting to work around a GCC warning." This reverts commit 3fe92086f1bdde06eb3e9bd812fc19a279154458.