Revert "fs: avoid ICE on Linaro"

This reverts commit b8ecfd34da013509ae420375109f5c7f2bfb4c20.