Revert "lib: avoid ICE on Linaro"

This reverts commit 916bf25c59f68ccb0d9d200ebf5ed0bba5ce9df7.

I don't get any ICEs when I compile with Linaro.