Revert "faal"

This reverts commit b91b155e6c63f2867142ac57d347587da8a18fea.