Revert "Even more files"

This reverts commit c37dd514a45fe6f54ec92b48a58f53a97cd6e75b.
Revert "Revert "Even more files""

This reverts commit ee664db372354718d2c60ed6f017726153d30578.