Apologies for the weird diff in this file.