Some missing files from cda44293bad9fb5b5bc452adbb3db21f7901a46d.