Revert "Avoid commit tmp files"

This reverts commit 56562336c9444065efa4e0e93d5123bc6843a223.