Ignore .bundle generated files
Revert part of "Sync with trunk"

This partially reverts commit 18b3000.