Revert commit 216002 which introduced a regression.
tree65666a63e8927b43e40054234dc1388da12acf9b
drwxr-xr-x - gcc-4_8-branch
drwxr-xr-x - gcc-4_9-branch