Fix breaking the build after removing files in tthe previous checkin.