These are two missing spots initially done by 52a5fe70. Checked on i686-linux-gnu. (cherry picked from commit 834ddd04)