base-files: revert r21595