Looks like that using a file-to-be-generated doesn't work as expected, so reverting previous patch. Sorry for the troubles. This reverts commit 1da09ac5.